Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 01:28:45 +0000 (17:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 31 Dec 2011 01:28:45 +0000 (17:28 -0800)
commit40f0c444a965b52741bcd5bde1adfdc695f32f11
tree0d7cdbb9b1167b87fbf1b58b66e1697a2041f13d
parentcc2fe7d366d562748391d894d3e39da870008491
parent306562bfe2a07c079ae022f391bb9a6fad6b3a40
Merge from trunk.